Update a11y tests

Working towards a passing testsuite.

diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 9b1a987b1c80bcb9d4bc9cd25573dd4aa429bd7f..de2dd67a2935245c8545ec231b5661d7299cc2b5 100644 (file)
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -773,7 +773,7 @@ window1
                 parent: grid
                 index: 0
                 description: Pick a color from the screen
-                state: enabled focusable sensitive has-tooltip
+                state: enabled focusable sensitive visible has-tooltip
                 toolkit: gtk
                 <AtkComponent>
                 layer: widget

diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index 75da91d9d12dce894dbe90d9abfb2f73ec634137..efbe14e90e505e1c766b0cc42d16d0a2569c0db2 100644 (file)
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -152,7 +152,8 @@ window1
       <AtkText>
       text: text
       character count: 4
-      caret offset: 0
+      caret offset: 4
+      selection 0: (0, 4) text
       default attributes: bg-color: <omitted>
                           bg-full-height: 0
                           direction: <omitted>

diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 432da3b4e5dfe3c73eadf9bed2a195a2eeb3d39a..ec3606f337a5b9dced0140bf723ce57164371d5c 100644 (file)
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   menubar1
     "menu bar"
     parent: window1

diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index 3477c322cc60719c74fe6e5d2130f6ada6d52fd8..d9893ab868b8b6cc151e31eb5a5c22501bc8095a 100644 (file)
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   menubutton
     "toggle button"
     parent: window1

diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index a660896ef847a874d9f1bfcb343f46815f5cc887..e5d8cbb537b1fb76d6c99bc196903a9307153607 100644 (file)
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -7,7 +7,15 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkPopoverAccessible-0
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+  unnamed-GtkPopoverAccessible-1
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -16,53 +24,53 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-1
+    unnamed-GtkStackAccessible-2
       "panel"
-      parent: unnamed-GtkWidgetAccessible-2
+      parent: unnamed-GtkWidgetAccessible-3
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-4
         "filler"
-        parent: unnamed-GtkStackAccessible-1
+        parent: unnamed-GtkStackAccessible-2
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-5
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-4
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-6
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-5
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-7
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-6
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-8
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-7
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible

diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index a660896ef847a874d9f1bfcb343f46815f5cc887..e5d8cbb537b1fb76d6c99bc196903a9307153607 100644 (file)
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -7,7 +7,15 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkPopoverAccessible-0
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
+  unnamed-GtkPopoverAccessible-1
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -16,53 +24,53 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-1
+    unnamed-GtkStackAccessible-2
       "panel"
-      parent: unnamed-GtkWidgetAccessible-2
+      parent: unnamed-GtkWidgetAccessible-3
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-4
         "filler"
-        parent: unnamed-GtkStackAccessible-1
+        parent: unnamed-GtkStackAccessible-2
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-5
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-4
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-6
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-5
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-7
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-6
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-8
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-7
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible

diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt
index a95a5b0c521fa4dbb34a3af5abc94e098b195385..5a71315868e7187f0c046999edc85da2a1049224 100644 (file)
--- a/testsuite/a11y/paned.txt
+++ b/testsuite/a11y/paned.txt
@@ -18,8 +18,8 @@ window1
     alpha: 1
     <AtkValue>
     minimum value: 0.000000
-    maximum value: 59.000000
-    current value: 25.000000
+    maximum value: 60.000000
+    current value: 26.000000
     label1
       "label"
       parent: paned1

diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index 5e7dbc097c4a1576ad506246315d36b4c5ee8e07..7f457e374a95131bf9ab450279ea0d0b88e6d910 100644 (file)
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -17,7 +17,7 @@ window1
     layer: widget
     alpha: 1
     button1
-      "combo box"
+      "unknown"
       parent: grid1
       index: 0
       state: enabled sensitive showing visible
@@ -25,20 +25,6 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      <AtkAction>
-      action 0 name: press
-      action 0 description: Presses the combobox
-      <AtkSelection>
-      popup_widget
-        "menu"
-        parent: button1
-        index: 0
-        state: enabled sensitive visible
-        toolkit: gtk
-        <AtkComponent>
-        layer: popup
-        alpha: 1
-        <AtkSelection>
     button2
       "unknown"
       parent: grid1

diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 3467462c5e69d91b73eb5ca737747df694a7296c..327b819ffabcd2770317e985d30a0e6b3e88ba60 100644 (file)
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   scale1
     "slider"
     parent: window1

diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index 2b250e6cf70edbac5e2ec0fa01fe021ebc1841f9..e2a0f3ed9947fa921d177cf81a10595ec61ec6da 100644 (file)
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -7,6 +7,14 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
+  unnamed-GtkContainerAccessible-0
+    "panel"
+    parent: window1
+    state: enabled sensitive showing visible
+    toolkit: gtk
+    <AtkComponent>
+    layer: widget
+    alpha: 1
   box1
     "filler"
     parent: window1